[lldb][test] When an external stdlib is specified do not link to the system stdlib #164462
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On linux if you specify the an external libc++ and clang will still link to the system's libc++. This patch fixes that.
Member
|
@llvm/pr-subscribers-lldb Author: Ebuka Ezike (da-viper) ChangesOn linux if you specify the an external libc++ and clang will still link to the system's libc++. This patch fixes that. Full diff: https://github.com/llvm/llvm-project/pull/164462.diff 1 Files Affected:
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index e72ffd1f030ec..1676fb3d4520c 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -386,6 +386,11 @@ ifeq (,$(filter 1, $(USE_LIBSTDCPP) $(USE_LIBCPP) $(USE_SYSTEM_STDLIB)))
ifneq "$(LIBCPP_INCLUDE_TARGET_DIR)" ""
CXXFLAGS += -cxx-isystem $(LIBCPP_INCLUDE_TARGET_DIR)
endif
+
+ # If `-nostdlib++` is not passed, clang will link to the system's stdlib.
+ ifeq ($(LDC), clang)
+ LDFLAGS += -nostdlib++ -nostdinc++
+ endif
LDFLAGS += -L$(LIBCPP_LIBRARY_DIR) -Wl,-rpath,$(LIBCPP_LIBRARY_DIR) -lc++
else
USE_SYSTEM_STDLIB := 1
|
da-viper
changed the title
Michael137
reviewed
Oct 21, 2025
dzhidzhoev
reviewed
Oct 22, 2025
Michael137
reviewed
Oct 28, 2025
| endif | ||
|
|
||
| # If `-nostdlib++` is not passed, clang will link to the system's stdlib. | ||
| ifeq ($(LDC), clang) |
Member
There was a problem hiding this comment.
Let's remove this. Clang, GCC and clang-cl are all aware of this option
Suggested change
| ifeq ($(LDC), clang) |
Michael137
approved these changes
Oct 28, 2025
Member
There was a problem hiding this comment.
LGTM. This should fix the immediate issue of accidentally linking against libstdc++ in the DAP tests. We should also add the flag to the USE_LIBCPP codepath as @dzhidzhoev pointed out, but I don't mind doing that in a separate PR. I was going to do a minor cleanup of this logic in a follow-up PR, and might include that in those changes.
Could add Fixes https://github.com/llvm/llvm-project/issues/116040 to the PR description before merging?
Member
|
Ignore the AArch64 CI failure. It has been unintentionally running on PRs as of late. |
dzhidzhoev
approved these changes
Oct 28, 2025
Lukacma
pushed a commit
to Lukacma/llvm-project
that referenced
this pull request
Oct 29, 2025
…system stdlib (llvm#164462) On linux if you specify the an external libc++ and clang will still link to the system's libc++. This patch fixes that. Fixes llvm#116040
aokblast
pushed a commit
to aokblast/llvm-project
that referenced
this pull request
Oct 30, 2025
…system stdlib (llvm#164462) On linux if you specify the an external libc++ and clang will still link to the system's libc++. This patch fixes that. Fixes llvm#116040
DEBADRIBASAK
pushed a commit
to DEBADRIBASAK/llvm-project
that referenced
this pull request
Nov 3, 2025
…system stdlib (llvm#164462) On linux if you specify the an external libc++ and clang will still link to the system's libc++. This patch fixes that. Fixes llvm#116040
dmpots
added a commit
to dmpots/llvm-project
that referenced
this pull request
Dec 3, 2025
This commit changes the test Makefile.rules to force linking with libstdc++ when building with hipcc. An upstream [change](llvm#164462) modified the test link commands to add -nostdlib++ to avoid linking both the internal llvm c++ library and the external system c++ standard library. This was causing linking failures when building with hipcc because it expects to use the system libstdc++ library.
da-viper
added a commit
to da-viper/llvm-project
that referenced
this pull request
Dec 4, 2025
…system stdlib (llvm#164462) On linux if you specify the an external libc++ and clang will still link to the system's libc++. This patch fixes that. Fixes llvm#116040 (cherry picked from commit ec55aa4)
dmpots
added a commit
to clayborg/llvm-project
that referenced
this pull request
Dec 4, 2025
This commit changes the test Makefile.rules to force linking with libstdc++ when building with hipcc. An upstream [change](llvm#164462) modified the test link commands to add -nostdlib++ to avoid linking both the internal llvm c++ library and the external system c++ standard library. This was causing linking failures when building with hipcc because it expects to use the system libstdc++ library.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On linux if you specify the an external libc++ and clang will still link to the system's libc++. This patch fixes that.
Fixes #116040